Update to rust master

Also stop denying all warnings and only deny some common warnings. Allow
warnings such as deprecation.

Closes #634

diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs
index 810456c74776e740ef2cc4c808aab3382627f612..da995818418ce93b852ad6b44909b4db57c56c55 100644 (file)
--- a/src/cargo/core/package_id.rs
+++ b/src/cargo/core/package_id.rs
@@ -112,13 +112,13 @@ impl Metadata {
     }
 }
 
-static central_repo: &'static str = "http://rust-lang.org/central-repo";
+static CENTRAL_REPO: &'static str = "http://rust-lang.org/central-repo";
 
 impl Show for PackageId {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         try!(write!(f, "{} v{}", self.name, self.version));
 
-        if self.source_id.to_string().as_slice() != central_repo {
+        if self.source_id.to_string().as_slice() != CENTRAL_REPO {
             try!(write!(f, " ({})", self.source_id));
         }
 
@@ -128,13 +128,13 @@ impl Show for PackageId {
 
 #[cfg(test)]
 mod tests {
-    use super::{PackageId, central_repo};
+    use super::{PackageId, CENTRAL_REPO};
     use core::source::{RegistryKind, SourceId};
     use util::ToUrl;
 
     #[test]
     fn invalid_version_handled_nicely() {
-        let loc = central_repo.to_url().unwrap();
+        let loc = CENTRAL_REPO.to_url().unwrap();
         let repo = SourceId::new(RegistryKind, loc);
 
         assert!(PackageId::new("foo", "1.0", &repo).is_err());

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index f3fa578a742588891e8bbcb577084fefc6f10446..f4d11bab1c0ace147455ea0d03e1e6be365e9813 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -3,7 +3,7 @@
 
 #![feature(macro_rules, phase)]
 #![feature(default_type_params)]
-#![deny(warnings)]
+#![deny(bad_style, unused)]
 
 extern crate libc;
 extern crate regex;

diff --git a/src/cargo/ops/cargo_rustc/compilation.rs b/src/cargo/ops/cargo_rustc/compilation.rs
index fb135ded046d42525ee9c7ff2945dfbf6d3d4391..2e78d0b46227a7a9a08cd23268a4cb59a34162bf 100644 (file)
--- a/src/cargo/ops/cargo_rustc/compilation.rs
+++ b/src/cargo/ops/cargo_rustc/compilation.rs
@@ -91,7 +91,7 @@ fn pre_version_component(v: &Version) -> Option<String> {
     let mut ret = String::new();
 
     for (i, x) in v.pre.iter().enumerate() {
-        if i != 0 { ret.push_char('.') };
+        if i != 0 { ret.push('.') };
         ret.push_str(x.to_string().as_slice());
     }
 

diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
index 46a020b8fa46419b2525355edf34a84ab9c89b17..3a503200cc419fc9ff5990aa4201be70688d0348 100644 (file)
--- a/src/cargo/util/process_builder.rs
+++ b/src/cargo/util/process_builder.rs
@@ -111,7 +111,7 @@ impl ProcessBuilder {
         let program = String::from_utf8_lossy(self.program.as_bytes_no_nul());
         let mut program = program.into_string();
         for arg in self.args.iter() {
-            program.push_char(' ');
+            program.push(' ');
             let s = String::from_utf8_lossy(arg.as_bytes_no_nul());
             program.push_str(s.as_slice());
         }

diff --git a/src/cargo/util/profile.rs b/src/cargo/util/profile.rs
index 20f9070c0bf022adbd4d930e56b3ba8c78e4a9e9..1f56ce306a5d1c2dbe71b3b73ab98617e5a42484 100644 (file)
--- a/src/cargo/util/profile.rs
+++ b/src/cargo/util/profile.rs
@@ -3,8 +3,8 @@ use std::mem;
 use std::fmt::Show;
 use time;
 
-local_data_key!(profile_stack: Vec<u64>)
-local_data_key!(messages: Vec<Message>)
+local_data_key!(PROFILE_STACK: Vec<u64>)
+local_data_key!(MESSAGES: Vec<Message>)
 
 type Message = (uint, u64, String);
 
@@ -17,9 +17,9 @@ fn enabled() -> bool { os::getenv("CARGO_PROFILE").is_some() }
 pub fn start<T: Show>(desc: T) -> Profiler {
     if !enabled() { return Profiler { desc: String::new() } }
 
-    let mut stack = profile_stack.replace(None).unwrap_or(Vec::new());
+    let mut stack = PROFILE_STACK.replace(None).unwrap_or(Vec::new());
     stack.push(time::precise_time_ns());
-    profile_stack.replace(Some(stack));
+    PROFILE_STACK.replace(Some(stack));
 
     Profiler {
         desc: desc.to_string(),
@@ -30,8 +30,8 @@ impl Drop for Profiler {
     fn drop(&mut self) {
         if !enabled() { return }
 
-        let mut stack = profile_stack.replace(None).unwrap_or(Vec::new());
-        let mut msgs = messages.replace(None).unwrap_or(Vec::new());
+        let mut stack = PROFILE_STACK.replace(None).unwrap_or(Vec::new());
+        let mut msgs = MESSAGES.replace(None).unwrap_or(Vec::new());
 
         let start = stack.pop().unwrap();
         let end = time::precise_time_ns();
@@ -54,9 +54,9 @@ impl Drop for Profiler {
             print(0, msgs.as_slice());
         } else {
             msgs.push((stack.len(), end - start, msg));
-            messages.replace(Some(msgs));
+            MESSAGES.replace(Some(msgs));
         }
-        profile_stack.replace(Some(stack));
+        PROFILE_STACK.replace(Some(stack));
 
     }
 }

diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
index f84260339542f84d8c0770e0ea0ffbc461062958..7a9ed2a0376d3f8d3da552d127afe02c36018f85 100644 (file)
--- a/tests/test_cargo_compile.rs
+++ b/tests/test_cargo_compile.rs
@@ -161,7 +161,7 @@ test!(cargo_compile_with_warnings_in_the_root_package {
     assert_that(p.cargo_process("build"),
         execs()
         .with_stderr(format!("\
-{filename}:1:14: 1:26 warning: code is never used: `dead`, #[warn(dead_code)] \
+{filename}:1:14: 1:26 warning: function is never used: `dead`, #[warn(dead_code)] \
 on by default
 {filename}:1 fn main() {{}} fn dead() {{}}
                           ^~~~~~~~~~~~
@@ -214,7 +214,7 @@ test!(cargo_compile_with_warnings_in_a_dep_package {
                              COMPILING, p.url(),
                              COMPILING, p.url()))
         .with_stderr("\
-[..]warning: code is never used: `dead`[..]
+[..]warning: function is never used: `dead`[..]
 [..]fn dead() {}
 
 "));